Handle return values from nl_langinfo() more correctly.

2007-06-09  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkcalendar.c (gtk_calendar_init): Handle return values
        from nl_langinfo() more correctly.

svn path=/trunk/; revision=18085

diff --git a/ChangeLog b/ChangeLog
index 4b7f4faaf5b670a543c529ed78f4e4cab55ae898..dddfacebfff0211ff854c318aa94c0b11d1b7b88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Handle return values
+       from nl_langinfo() more correctly. 
+
 2007-06-09  Carlos Garnacho  <carlos@imendio.com>
 
        * gtk/gtkrc.c (gtk_rc_parse_engine): initialize rc_priv in the else

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 1b6f0f18e759e8981ffb199e372ed7dec0060067..dc32cba7a845d76c2d04dbf6d18d12507c095e9b 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -568,7 +568,7 @@ gtk_calendar_init (GtkCalendar *calendar)
   GtkCalendarPrivate *priv;
   gchar *year_before;
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
-  gchar *langinfo;
+  union { unsigned int word; char *string; } langinfo;
   gint week_1stday = 0;
   gint first_weekday = 1;
   guint week_origin;
@@ -688,10 +688,10 @@ gtk_calendar_init (GtkCalendar *calendar)
     }
 #else
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
-  langinfo = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
-  first_weekday = langinfo[0];
-  langinfo = nl_langinfo (_NL_TIME_WEEK_1STDAY);
-  week_origin = GPOINTER_TO_INT (langinfo);
+  langinfo.string = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+  first_weekday = langinfo.string[0];
+  langinfo.string = nl_langinfo (_NL_TIME_WEEK_1STDAY);
+  week_origin = langinfo.word;
   if (week_origin == 19971130) /* Sunday */
     week_1stday = 0;
   else if (week_origin == 19971201) /* Monday */